From: Juanma Barranquero <lekktu@gmail.com>
Date: Fri, 25 Oct 2002 06:50:01 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~30056
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a53a0d726ef70b0abbfe2ce8565107961f816e5a;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b7bf38954e2..d66250c18ee 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,10 +1,17 @@
+2002-10-25  Juanma Barranquero  <lektu@terra.es>
+
+	* macgui.h:
+	* w32gui.h: Remove definition of XColor.
+
+	* dispextern.h [!HAVE_X_WINDOWS]: Define XColor.
+
 2002-10-24  Kim F. Storm  <storm@cua.dk>
 
 	* xdisp.c (get_window_cursor_type): New arg ACTIVE_CURSOR.
 	Callers changed (supply dummy arg).
 
 	* lisp.h (get_window_cursor_type): Update prototype.
-	
+
 	* w32term.c (x_display_and_set_cursor): Get active_cursor from
 	get_window_cursor_type to track system caret.